From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 20 Sep 2012 13:58:08 +0000 (+0200)
Subject: popupMenu: Set initial visibility of settings items
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5780
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e8ebe4de142772041c6e2d681d92322776ab361c;p=gnome-shell.git

popupMenu: Set initial visibility of settings items

With the recent session mode changes, the visibility of settings
items is now only set on sessionMode::updated - while the signal
is emitted when the session mode is initialized, settings items
that are added after that are visible regardless of the allowSettings
setting until the next sessionMode::updated signal is received.
Fix this by explicitly setting the initial visibility of settings
items.

https://bugzilla.gnome.org/show_bug.cgi?id=684473
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index c4b6c4ea6..23368a5b6 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -904,6 +904,7 @@ const PopupMenuBase = new Lang.Class({
                            app.activate();
                        });
 
+        menuItem.actor.visible = Main.sessionMode.allowSettings;
         this._settingsActions[desktopFile] = menuItem;
 
         return menuItem;